From bc1a96d9a81b30561c29ba10fd4a3bc87560d1e7 Mon Sep 17 00:00:00 2001 From: "smh22@tempest.cl.cam.ac.uk" Date: Fri, 4 Mar 2005 16:10:08 +0000 Subject: [PATCH] bitkeeper revision 1.1236.10.1 (42288860WihptaT0mMRS7KBmfxWFcA) build fixes Signed-off-by: steven.hand@cl.cam.ac.uk --- BitKeeper/etc/ignore | 49 +++++++++++++++++++ .../drivers/xen/netback/netback.c | 8 +++ 2 files changed, 57 insertions(+) diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore index a248c75b8c..3c7420ae36 100644 --- a/BitKeeper/etc/ignore +++ b/BitKeeper/etc/ignore @@ -101,3 +101,52 @@ xen/tools/figlet/figlet xen/xen xen/xen-syms xen/xen.* +linux-2.6.10-xen-sparse/include/asm-xen/hypervisor.h.smh +tools/Makefile.smh +tools/blktap/Makefile.smh +tools/blktap/blkcow +tools/blktap/blkcowgnbd +tools/blktap/blkcowimg +tools/blktap/blkdump +tools/blktap/blkgnbd +tools/blktap/blkimg +tools/blktap/blockstore.dat +tools/blktap/parallax +tools/blktap/vdi.dot +tools/blktap/vdi.ps +tools/blktap/vdi_create +tools/blktap/vdi_fill +tools/blktap/vdi_list +tools/blktap/vdi_snap +tools/blktap/vdi_snap_list +tools/blktap/vdi_tree +tools/blktap/vdi_validate +tools/blktap/xen/arch-ia64.h +tools/blktap/xen/arch-x86_32.h +tools/blktap/xen/arch-x86_64.h +tools/blktap/xen/dom0_ops.h +tools/blktap/xen/event_channel.h +tools/blktap/xen/grant_table.h +tools/blktap/xen/io/blkif.h +tools/blktap/xen/io/domain_controller.h +tools/blktap/xen/io/ioreq.h +tools/blktap/xen/io/netif.h +tools/blktap/xen/io/ring.h +tools/blktap/xen/io/usbif.h +tools/blktap/xen/linux/privcmd.h +tools/blktap/xen/linux/suspend.h +tools/blktap/xen/physdev.h +tools/blktap/xen/sched_ctl.h +tools/blktap/xen/trace.h +tools/blktap/xen/xen.h +tools/cmdline/Makefile +tools/cmdline/ringbuster +tools/cmdline/ringbuster.c +tools/cmdline/xdestroy +tools/cmdline/xdestroy.c +tools/cmdline/xevtchn +tools/cmdline/xevtchn.c +tools/cmdline/xls +tools/cmdline/xls.c +tools/cmdline/xphysinfo +tools/cmdline/xphysinfo.c diff --git a/linux-2.6.10-xen-sparse/drivers/xen/netback/netback.c b/linux-2.6.10-xen-sparse/drivers/xen/netback/netback.c index cd20eda5bc..248711646b 100644 --- a/linux-2.6.10-xen-sparse/drivers/xen/netback/netback.c +++ b/linux-2.6.10-xen-sparse/drivers/xen/netback/netback.c @@ -14,6 +14,10 @@ #include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) +#include +#endif + static void netif_idx_release(u16 pending_idx); static void netif_page_release(struct page *page); static void make_tx_response(netif_t *netif, @@ -500,7 +504,11 @@ static void net_tx_action(unsigned long unused) netif->credit_timeout.expires = next_credit; netif->credit_timeout.data = (unsigned long)netif; netif->credit_timeout.function = tx_credit_callback; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) add_timer_on(&netif->credit_timeout, smp_processor_id()); +#else + add_timer(&netif->credit_timeout); +#endif break; } } -- 2.30.2